Moved some stuff around and linked to a proper file