Fixed dependencies
Merge pull request #2 from glatorre/master

Restructured code due to modularization