some fixes, rename files