Commit 2

Proper organisation