Restructured project to be a Maven project