More restructuring
Even better structure for now.