re-arranged folder structure, also fixed major bug in verify(), and some other refactoring