Moved everything into src dir