moved to subdirectory, removed some files that were twice
now things are instantiable