Moved everything into src