Lots of changes and organization