removed redundant dirs and whitespace
Merge pull request #82 from oafridi/refactor

removed redundant dirs and whitespace