Reorganized services file structure