fix Makefile and directory structure for component build
support existing buttons