Re-arrange directory strcuture
Removed list of NamedElements from Model, replaced with list to Building