reorganize files
reorganize more files
Merge pull request #34 from LifeMushroom/organize

organize files