More of building structure
Merge branch 'master' of https://github.com/Jenjen1324/MCM-v3 into dev