clean up
Use attic
More clean up
More renames