[simon@falinux.com] re-organized directories