naming convention of ID and removed unused files
avoid duplicate classes
Merge pull request #11 from Qwinix/issue_3

naming convention of ID and removed unused files