renamed files, reorganize security structure