Remove old file from component.json
Rearrange files, need help with groking component building