Restructuring for main 'site' use.
Restructuring data, creating basic API handles