git and folder cleanup