Moved everything into one file