Change project structure and implement take/drop