V1 of class structure
Merge pull request #2 from Frostlock/master

V1 of class structure