Re-organized directories.
Merge pull request #79 from ocefpaf/rename_dirs

Re-organized directories.