refactorign server + bower dependencies