Refactor folder structure and & Wrapper global service.