changed folder structure to ease testing and deployments