Really reworked stuff
Work on restructuring assets