Cleanup

Clean up  , renamed some files