Cleaned up directory structure
Merge branch 'master' of https://github.com/Yaiyan/Bat