moved files around
Moved everything into src