Move stuff around and add library template
Merge pull request #32 from vosen/master

Move stuff around and add library template