Refactor files slightly (split assets from attributes) as they were getting unwieldy