Renamed + Cleanup

Renamed Combin.... to PM_TypesAndUsage for consistency / folder org

Cleaned up files