Restructure packages and rename/move files and directories

Fixes #47
Prepare #62 and #63