Made module folder-independent