Reorganized file structure using interfaces