Move forms into 'forms' folder