making project structure a bit nicer