Made everything into a single file