Moved to proper maven project structure