Add scheduler. Rename more classes
>_<