renaming some files and changing design strategy