Delete old src. Add some new
Final version