Cleans up code a little more, divides the code into their relevant files.