Moved into package directory and added some comments