Cleaned-up file structure