Bug fixes and enhancement

Fixed folder structure and requirement bugs. Added more components.