Refactoring, removing CloudNCo_Security file