[WIP][Issue/115] Link folders to the actual folder instead of the parent

Fix #115 

ApiTest fails because we need to set up some more objects there. Will fix tomorrow.