#178 restructured things for libGDX