file structure check and fix attempt
bug check
Merge pull request #40 from elcabong/Dev

Dev