[wip] clearing code and renaming; and licences
[wip] [bad] not building after refact