Restructured project ready for maven