changed directory structure
reworked problem 1, added a test