Feature/restructure for rebrand