Reverted to Fred's .cproject and .project and moved test/src files to test