Refactored file structure to allow server code development