[Large commit] project organization and general adding of code.
Merge branch 'master' of https://github.com/Orcem/Main