Updated theme structure

New theme structure. Update this as a reference branch.