Moved Interfaces to Folder