Fixed author line
Moved stuff around

TODO Still need to fix the actual code to use the new paths
Include ini file
Made all in-package paths hard-coded, fixed code to work with new paths
Merge branch 'feature/reorganize' into develop