New file structure is working