Add support for non constructor components
Update file names