Relocated files/cleaned up