Rearranging project structure to account for server