Increased functionality

Reorganized class and removed unused floats/vec2