Refactored into Netbeans Project