Karlo's changes to project folder