Start restructuring, update README