Initial commit. Started building modular structure.
Merge remote-tracking branch 'fskreuz/master'