Misc fixes and folder restructuring, cleanup