Fixed building class with decorator + added Building.java