- moved some SystemInfo classes to new subdirectory