Resolves #9
Moved files and Directory Structure Changed #16
Issue #15