Merge pull request #2 from Wasper/dev

Skeleton structure