reorganized the file directory
merged branch with master
This is getting rather hairy~