moving to bower, refactoring WIP