Basescape folder overhaul part 2