re-arranged directories