organized Preparation code
Started Rebuild