Reorganized files, preparing conversion into game