Moving internal class to the right place