Directory structure has been updated to common Maven style.