changed directory structure, added service