This is a commit done directly from within Netbeans IDE
Did a majore project structure shift and Class definiation change as well.