restructuring and adding additions
Merge pull request #4 from samanpwbb/revisions

Restructuring and adding additions