remove unused files
clean unused code
Add Test & Spec