cleaner project structure, now all are subfolders of main maven project