Fixed package.json. Code clean up. Prepared overlay inclusion.