Changed directory structure around to mimic that of the actual server