Rename and move py files to be less redundant, fix SQL insert and creation.