restructure + cleanup. toxUi-stuff is now separeted