Builder module updates, splitting them into folders so each can have unique preview images