Prepared for spacefolder implementation
First step towards implementing Spacefolders.