Continued editing development.
File renames
Remove some commented code.