Restructured to a maven project