StackSize/Singleton classes moved to correct file