clean and reorganize
wip
post build tasks