Reorganized files more logically
Added missing libraries
Merge pull request #1 from Blir/dev

Reorganized files more logically