Rm Duplicate src files. Added menus code to main and some factory methods.