Putting everything inside a class, doesn't mean better structure