Cleanup of main folder