Move Singleton interface to it's logic folder