Working on transferring structure stuff to structure dirs