some serious moving, another step to mavens default layout