More project folder cleanup