Updating the problem statement and dir structure