changed some project structure