clean-up: source organization
Merge branch 'chrome'
fix everything