Restructuring project for Maven and removing junk files