cleaned up directory, added some work on week2