- restructuring in SystemInfo subdirectory