Cleanup, moving files and standardization.