Beginning of 2.0 changes, removed old files, added application listing and some logic