restructure for security