minor re-org and added stuff for KCDC.
updated mockup
updating and adding for CODODN.