massive overhaul of mariqt older structure to become more generic. includes renaming of files and classes.