Moved project to True Maven structure