Reverted directory structure. DO NOT CHANGE.