Project Structure Updates

__init__ files
Merge remote-tracking branch 'origin/master'