Rearrange of all of the stuff and adding the netbeans project