Refactoring, added class and bin cog instantiation