initial component move

code changes to bundle components in appmaker dir
Code changes for the moved components