Reorganizing for NetBeans Compatability