Reorganizing a bit and moving font-awesome to bower