Moved extended classes to placeholders