improvements on project structure