Change to Eric structure

Put every functions into methods of class