Removed Testfiles
Modularized the code