[#24] Reorganized services area, redid services retrieval. Also made Engine a singleton.