Refactoring to make building, population a resource
deleted files