Implemented the tasks, added tests
reorganizing projects