Added some functionality to allow retrieval of a single content object from the database. Also moved classes around into slightly better packages. Tidied up unused import statements and added some javadoc too.