Reorganized files
Merge pull request #1 from Wartz/master

Reorganized files