remove duplicate files, fix service structure