Reorganization for bower install