better imports
Setup instructions
Cleanup part 1
Move file to better name
Merge pull request #1 from NotBobTheBuilder/refactor

Refactor