Cleaned up POMs after project restructuring