Minor changes

Updated the folder structure to remove the extra unneeded folder, which will allow submoduling.

Also fixed a minor strict warning bug in the component class.

Ta