removing the files that should not be there
moving classes around a bit
doing the recommended way of creating the singleton pattern
removing the local list, since it is already part of the adapter
Merge branch 'cleanup_code' into develop