Working server, reorganized file structure