Add Noty, remove Builder, Move builders to Builders directory.