move files to appropriate subdirectories
Merge pull request #24 from petercable/cleanup

move files to appropriate subdirectories