Removed 'PreAPCS-' from root directory names