Rearrange codebase

Re-arranging the base codebase structure to sync with eclipse Egit
Plugin