Added font-awesome via bower, some file reorg