Putting instances in source directory and fixing up a few things