Oops commited broken code, also renamed a class again xD