Version02

Incorporating elationfoundation's oneclick changes. Removing dead files. Config file rename.