[TASK] relocated files for autoloading