Code refactorization:
-Component module deleted completely