Moving files around for modularization
Merge pull request #70 from felixcheng/solo2

 Moving files around for modularization