Finished organizing code into separate files