Resetup and framework layout
Locaiton setup
Merge pull request #2 from DonoA/master

Setup stuff