Fixing directory layout to prepare for a NetBeans project layout.