moved around some files and code