Fixed dependencies
Merge pull request #1 from glatorre/master

Restructured code due to modularization