Reorganized directory structure to match UNIX one