Major overhaul to file structure but requires CSS clean up