Got fancy links to work, also moved admin into its own category. Next after this is to remove the old admin files.