Integrated all into one folder

Deleted all separate files
1. replaced my code with johan's code