Initial skeleton
Merge remote-tracking branch 'remotes/upstream/master'
Refactorized
Updates and restructures