Refactored components directory
Fixed spacing