cleaned-up file structure