revamping file hierarchy and adding quicksand use