Changed directory structure to include ALL files needed for server