Re-factored the package structure
Merge pull request #6 from JavaNarayan/develop

Re-factored the package structure