Update to match the new project structure
Use features opt-in
Better and final structure + battleship template