Cleanup naming page code
Starting to merge building and structure