Moved more stuff

Signed-off-by: notrodash <n@notr.co>