some restructuring, updated README