restructure to fit apache deployment