restructure and include bower