First major overhaul plus added bower and grunt