Refactor

Re-factor and re-organized directories for phase-2.