extracting classes to its own files, erasing unused includes pragmas