Restructure complete: Ready to merge back to master