Assignment consistency & moving folders
Merge pull request #237 from depstein/smallfixes

Assignment consistency & moving folders