Cleaned up main directory and moved excess test files into Tests