Changed the structure around to support the maven tools.