renamed the directories and files
initial commit after modularizing
fixed #2 and #4
Merge pull request #5 from abejfehr/development

Development