rather large shakeup of how files are organized, trying to get this into a standard package format
Merge branch 'package_migration' into refactoring