Moved structure of stuff around