folder cleanup and minor fixes
Merge branch 'master' of http://github.com/chanvi1/hba