We hate subdirectories, so lets move optional hal pieces together with other hal sources