breaking things into different files
Merge pull request #2 from jolleon/cleanoldcrap

breaking things into different files