devide Building class and fix typo
Merge branch 'dev'