split up code files, beginning cleaning.