Improve tahrirs package structure 73666726

Has been restructured a little, please share your feedbacks so that there is a structure that is mostly right and understandable.