refactoring : moved components to dir components; code clean