ZMVC commit

Major changes on all files.