Committed all relevant files. Hopefully did not break netbeans.