Valama: Improved current file structure usability