Fixed directory layout to prepare for deployment