Refactored code directories.
Merge pull request #2 from aleph2012/refactor-code-directories

Refactored code directories.