Reorganized files, added renderer code