added modules and fixed api urls