changed dir structure and coded first week