CIA: Removed eclipse config files and added diag

Also fixed some bugs