Reorg. Standardize bibliography

These changes will begin to stop my eyes bleeding.