application and folder restructure
refactored with service factory