Ridiculous hack for component creation, Makefile cleaned up a bit. Input
files added.