Added more crypto headers. Some restructuring and cleanup to prepare for development