service folder and name changed/ name of varibles and functions refactoried; project na changing