Improve front end file structures