Move code into their own files, better structure yo!