moved everything into src