refactor folder organization and renaming stuff

general cleanup, no behaviour changed 
Change `this` to `__`?