Un-ignored cbp files and removed extraneous folder