Folder restructure and oozie bug fix