Moved some files around for better structure.