Refactoring services and starting implementation for file usage.