Reorganization

first steps towards reorganizing