Edit bower dependecies and reorganize