Preloader changes and folder moves
Merge pull request #24 from ZachMSU/preloader_branch

Preloader changes and folder moves