File Name Cleanup

Did a clean up of file names and moved some older parts to a new folder
to get them out of the production area.