Reorganised folder structure to support psr-0 class autoloading