restructurisation of classes placement; added buildings classes;