Reorganized code

Author adein <adeinpublic@gmail.com>
Author date 2015-02-10 23:54:40
Author local date 2015-02-10 18:54:40 -0500
Committer adein <adeinpublic@gmail.com>
Committer date 2015-02-10 23:54:40
Committer local date 2015-02-10 18:54:40 -0500
Commit HEAD
Tree c12634b76bbf24066f3d64df9984b32a9676ee1b
Parent 57392a8b40568bbe9f59eee3169209b26a8170aa
Reorganized code