Restructed file hierarchy again