Refactored components to individual files.