Restructured to accomodate system files