Structural changes to file system, also started working on porting existing master code to be plugins