Added support for bower and switched to using classes