Moved everything into src dir, got rid of old stuff