Added lib folder to prepare for component
Added support for component[1]