Organize methods
Fix compile issues
Merge pull request #7 from stuntguy3000/master

Organize methods