Did some changes to module names and
added some modules that should be part of the project and haven't
been finished!
Needed to add files, even though I thought the -a flag did that...