Added sample code for new OO based directory structure