Some more restructuring and file cleanup