Moved some code into separate files