Moved everything into there own files, looks more or less done.