moved some declarations around so I can use it better in another project
Merge pull request #6 from novacrazy/v0.10.31

moved some declarations around so I can use it better in another project