Remove old files
Add structure a tests
Update structure a tests