Sorting out hierarchy
States update - moving resources
removing bin/ again
Playing around with states