Add activity 4 and rename some folders