Reorganized,updated, and cleaned project components