changed folder structure, added classes for functions