[FEAT] some refactoring + fixing file paths