restructuring
Merge branch 'master' of github.com:jstrength/OS
restructing...