rm env
refactor file structure