service component working, few folder changes and files moved