major update: project merge and preparation for abstraction of the security levels