more testing
Joining projects, relocating files

What a mess! =)