Remove dead code and test files restructure