Refactor

Refactored files and updated server to serve properly.