More CI and base file organization
Merge pull request #6 from stulees/master

More CI and base file organization