rearranging code files
fixing bug with animation
removing unimplemented method
code layout fix