Refactored the package structure to project specs. We will probably need someones specific eid but this is a start.