Moved the tests & the code to the respective folders