Refactoring for ease of deployment
Forgot to add all files