Some simple updates; changed directory structure