refactor structure of psycho