More restructuring, updated README