Folder restructure and oozie bug fix
Pushing up v0.7