Moving classes to includes file