Restructuring into Maven-esque layout