Altered Project Structure to Maven 'standard'