Reorganizing
Reorganize for NetBeans