Change class structure
Move test files