Renamed and moved some files
Deleted some old test files