Project structure changed to meet maven3 requirements