Rearranged files and edited bower.json