Files are moved to services and domain module