Added the Phone module and refactored code
Initial commit for the dev branch