moving everything into one file