New file structure, basic test interface