Cleaned up some files, reorganized constants files.