Further restructuring and work on database infrastructure and class autoloading.