Remove two test files.
Added some new modules. Still not working great but getting there...