Renamed package directories
Rename completed
Merge pull request #37 from janm399/master

Big renaming completed. Close #36.