Refactor: moved utils code to more intuitive and logical files