Better file organization; fixed issues with missing libraries
Merge pull request #2 from Blir/dev

Better file organization; fixed issues with missing libraries