Huge commit. See extended description

New layout...
Merge pull request #1 from sulfo/dev

Huge commit. See extended description