Move most everything into 1 file