Significant restructuring of system to decouple & reduce dependancies