deleted old files and refactor