Project setup, more changes