Changed directory structure for use with Maven