[TASK] Move stuff into other subdirectory