Removed dependency on Sites app, code refactor, version update