small cleanup, moving and removing files