project structure change

modules one level higher