Moved files out of superfolder.
Custom annotations.
Don't rebuild annotations when they have not changed.