refactor files and controllers names