rearrange directory structure to solve build issues
Merge pull request #5 from 0xor1/dev

rearrange directory structure to solve build issues