reorganize for bower