Tidy up server directory structure