Move some stuff around so that main is smaller