reorganized file structure to better support FE server