Code cleanup, commenting, some file renaming