Completely reorganize and cleanup aliases