Removed redundant OS folders, typeclass tweaks