Restructured filesystem and added links