Redo structure of the project, remove requirements and design