[Step3] Rename more things and trim the fat.

PS1:     Initial start, still seems to build.
PS2+PS3: Roll hard or die a wimp.
PS4+5:     Clean up the mess. +BEAST

To-Do:  Make sure things are still working right with the reduced files.
        Update more styles.

Change-Id: I67cc111bb51706d6a1066455d1e73a0a199498ec