Refoctoring
Removed unused files