Refactor structure. Users test done successfully
Files placed on api/