Now using maven directory structure