remove redundant naming in file, use less aggressive naming
tone down role naming
tone down role naming
add a little file hierarchy
Merge pull request #4 from python/cleanup

cleanup naming and directory layout.