Fix module detection, and move test files into analysis/targets
Merge pull request #23 from Ceasar/kyle-integrate-modules

Fix module detection, and move test files into analysis/targets