refactor: files separation, better naming