simplifyng files structure