More modular file structure