[ORGANIZATION] make different files more independent