improved file structure #2