Changed some project structure related stuff