removed data folder, altered docblock in global.php