changed app/js structure