Removed unused password variable
Moved services to serviceprovider files