Rebranding and reorganizing
wip
First implementation working!