Changing directory layout
Changed directory layout, added tests