Restructured directories and removed quicksilver