Resolves #5: Refactor into services folder structure