[TASK] Big cleanup, move files and class.