renames some files, more shuffles

Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>